reordered navi links, new talk is structure (no escaping applied with structure keyword)

diff --git a/templates/xhtml_slim.pt b/templates/xhtml_slim.pt
index 2660de7..5588c52 100644 (file)
--- a/templates/xhtml_slim.pt
+++ b/templates/xhtml_slim.pt
@@ -35,7 +35,7 @@
               <h3 id="siteSubtitle" i18n:translate="string:fromwikipedia">From Wikipedia, the free encyclopedia.</h3>
               <div tal:condition="subtitle"  id="documentSubtitle" tal:content="structure subtitle"></div>
               <!-- <esi:include src="userxy/message"/> cached per user, purged on new message-->
-              <div tal:condition="newtalk" class="portalMessage" tal:content="newtalk"></div>
+              <div tal:condition="newtalk" class="portalMessage" tal:content="structure newtalk"></div>
               <!-- the content area is cached with the remaining inexpensive sceleton, one version for all.
               The edit links and right-click section stuff can be attached from js -->
               <!-- start content -->
@@ -57,7 +57,7 @@
           <ul>
             <li tal:repeat="action content_actions" 
             tal:attributes="id string:contentaction-${repeat/action/key}; class action/class|default"><a
-              tal:attributes="title action/ttip|default; accesskey action/akey|default;href action/href|default"
+              tal:attributes="title action/ttip|default;accesskey action/akey|default;href action/href|default"
               tal:content="action/text">Linktext</a></li>
           </ul>
         </div>
@@ -87,12 +87,18 @@
                 <li><a href="${nav_urls/mainpage/href}"
                   i18n:attributes="accesskey string:accesskey-mainpage | default; title string:tooltip-mainpage"
                   i18n:translate="string:mainpage">Main Page</a></li>
+                <li tal:condition="nav_urls/portal/href"><a href="${nav_urls/portal/href}"
+                  i18n:attributes="accesskey string:accesskey-portal | default; title string:tooltip-portal|default"
+                  i18n:translate="string:portal">Community Portal</a></li>
+                <li tal:condition="nav_urls/currentevents/href"><a href="${nav_urls/currentevents/href}"
+                  i18n:attributes="title string:tooltip-currentevents|default" 
+                  i18n:translate="string:currentevents">Current Events</a></li>
                 <li><a href="${nav_urls/randompage/href}"
                   i18n:attributes="accesskey string:accesskey-randompage | default; title string:tooltip-randompage" 
                   i18n:translate="string:randompage">Random Page</a></li>
-                <li tal:condition="${nav_urls/currentevents/href}"><a href="${nav_urls/currentevents/href}"
-                  i18n:attributes="title string:tooltip-currentevents|default" 
-                  i18n:translate="string:currentevents">Current Events</a></li>
+                <li><a href="${nav_urls/help/href}"
+                  i18n:attributes="title string:tooltip-help|default" 
+                  i18n:translate="string:help">Help</a></li>
                 <li><a href="${nav_urls/sitesupport/href}"
                   i18n:attributes="title string:tooltip-sitesupport|default" 
                   i18n:translate="string:sitesupport">Donations</a></li>
@@ -122,18 +128,15 @@
           <div class="portletBody">
             <div class="portletContent odd">
               <ul>
-                <li><a href="${nav_urls/help/href}"
-                  i18n:attributes="title string:tooltip-help|default" 
-                  i18n:translate="string:help">Help</a></li>
                 <li><a href="${nav_urls/recentchanges/href}"
                   i18n:attributes="accesskey string:accesskey-recentchanges|default; title string:tooltip-recentchanges|default" 
                   i18n:translate="string:recentchanges">Recent Changes</a></li>
-                <li><a href="${nav_urls/recentchangeslinked/href}"
-                  i18n:attributes="title string:tooltip-recentchangeslinked | default"
-                  i18n:translate="string:recentchangeslinked">Related Changes</a></li>
                 <li><a href="${nav_urls/whatlinkshere/href}"
                   i18n:attributes="accesskey string:accesskey-whatlinkshere|default; title string:tooltip-whatlinkshere|default" 
                   i18n:translate="string:whatlinkshere">What links here</a></li>
+                <li><a href="${nav_urls/recentchangeslinked/href}"
+                  i18n:attributes="title string:tooltip-recentchangeslinked | default"
+                  i18n:translate="string:recentchangeslinked">Related Changes</a></li>
                 <li><a href="${nav_urls/specialpages/href}"
                   i18n:attributes="title string:tooltip-specialpages|default"
                   i18n:translate="string:specialpages">Special Pages</a></li>